Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 19 May 2006 15:21:49 +0000 (16:21 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 19 May 2006 15:21:49 +0000 (16:21 +0100)

Trivial merge